git rebase conflict resolution